From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Wed, 4 Apr 2012 21:48:47 +0000 (-0400)
Subject: Link the gnome-shell binary to libgnome-shell-js.so
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~6579
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=e20ea19f34a4ef9661c3cece2793c0c7f5d3dca9;p=gnome-shell.git

Link the gnome-shell binary to libgnome-shell-js.so

Depending on the exact linker options and versions, rpath's written
into the binary may, or may not, be honored by dlopen(). Work around
this by simply linking the gnome-shell binary to gnome-shell-js, since
then dlopen() doesn't need to search paths.

https://bugzilla.gnome.org/show_bug.cgi?id=670477
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 981a16d4b..dc5137e34 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -193,7 +193,7 @@ libgnome_shell_la_gir_sources = \
 gnome_shell_real_SOURCES =		\
 	main.c
 gnome_shell_real_CPPFLAGS = $(gnome_shell_cflags)
-gnome_shell_real_LDADD = libgnome-shell.la $(libgnome_shell_la_LIBADD)
+gnome_shell_real_LDADD = libgnome-shell.la libgnome-shell-js.la $(libgnome_shell_la_LIBADD)
 gnome_shell_real_DEPENDENCIES = libgnome-shell.la
 
 EXTRA_DIST += test-gapplication.js